Merge changes from emacs-23 branch
authorChong Yidong <cyd@stupidchicken.com>
Sun, 31 Oct 2010 14:41:32 +0000 (10:41 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sun, 31 Oct 2010 14:41:32 +0000 (10:41 -0400)

Trivial merge